Implemented proper structure.