Code refactored, build using release configuration fixed