Readded some functionality
Added sample data only on first run
Small improvements