Fixed #4 implementing the interfaces methods