Some refactorings
checkpoint: plan bean creator
checkpoint: nice design ;)