Refactored core datatypes. Added additional unit tests.