Refactored for LineStorm CMS migration