Added basic mechanic handling