Just some definition changes for convenience