Removed Enderstorage dependency by moving the call to its own class