Hopefully solve coremod dependency problem
Simplifying and fixing OP integration