Removed several calls to normalized path method
Created sql constants