new extension methods + removing constants.cs