2013-04-12 Prepare for refactoring
2013-04-12 Prepare for refactoring