Updated to include core drawer less variables