Moved custom cs changes to separate file