Fixing build issues
Refactoring