Modified some logic (imported implemented methods)