Fixed issue with not implementing interfaces