Added config setup, removed hardcoded data