Removed the need of the extras parameters