Prepare class declaration
Refactored position handling