Removed base dependency