updated build file, refactored pimped types