Version 0.6.1 Replaced definitions with static variables