Moved constants to implementation file, added types