Added more inline implementations