Added implementation of methods