Removed hard coded configurations