Updated data types and stubbed out more methods