Updates and add REM Mixin