Cleanup and added configuration propetie