Moved modifier into file