Rework to accompany Forge1.7.2 changes

Signed-off-by: EviiL <eviildesigns@gmail.com>