Added new configuration and fixed bugs