Subpage support added, still adding events