[FEATURE] Include basic parametar handling
[TASK] Small cleanups