Added remaining functions for basic structure