diff --git a/api/api.go b/api/api.go
deleted file mode 100644
index 778f64e..0000000
--- a/api/api.go
+++ /dev/null
@@ -1 +0,0 @@
-package api
diff --git a/main.go b/main.go
index ad977a9..680fe2b 100644
--- a/main.go
+++ b/main.go
@@ -7,7 +7,6 @@ import (
 	"github.com/Garionion/ffmpeg-playout/api"
 	"github.com/Garionion/ffmpeg-playout/playout"
 	"github.com/Garionion/ffmpeg-playout/store"
-	"github.com/golang/protobuf/ptypes"
 	"github.com/ilyakaznacheev/cleanenv"
 	"google.golang.org/grpc"
 	"log"
@@ -31,9 +30,8 @@ type Config struct {
 	PrometheusPushGateway string   `yaml:"prometheusPushGateway"`
 }
 
-func (g *server) schedulePlayout(ctx context.Context, job *api.Job) (*api.ScheduledJob, error) {
+func (g *server) SchedulePlayout(ctx context.Context, job *api.Job) (*api.ScheduledJob, error) {
 	var p *playout.Job
-	var err error
 
 	if job.Source == "" {
 		return nil, errors.New("Got Empty Source. I can't play »Nothing«")
@@ -54,14 +52,10 @@ func (g *server) schedulePlayout(ctx context.Context, job *api.Job) (*api.Schedu
 	p.ID = job.ID
 	p.Source = job.Source
 	p.Version = job.Version
-	p.StartAt, err = ptypes.Timestamp(job.StartAt)
-	if err != nil {
-		return nil, err
-	}
+	p.StartAt = job.StartAt.AsTime()
+	p.StopAt = job.StopAt.AsTime()
 	if p.StopAt.IsZero() {
 		p.StopAt = p.StartAt.Add(g.Store.DefaultDuration)
-	} else {
-		p.StopAt, err = ptypes.Timestamp(job.StartAt)
 	}
 
 	if playoutExists {
diff --git a/playout/playout.go b/playout/playout.go
index c50fddf..5e77fcc 100644
--- a/playout/playout.go
+++ b/playout/playout.go
@@ -95,6 +95,7 @@ func (p *Job) Playout(cfg *Config) {
 	playoutScript := path.Join(cfg.PlayoutScriptPath, cfg.PlayoutScript)
 	for {
 		log.Printf("Start Playout for %v", p.ID)
+		log.Println(p.StartAt)
 		log.Println(p.StopAt)
 		log.Println(time.Until(p.StopAt))
 		cmd := exec.Command(playoutScript, //nolint:gosec