- internal refactoring to comply with the alamid plugin-pattern