Refactor to comply with current SpongeAPI