Removed inline definition of member functions