Fixed non-working functions in base classes