Added revamped support, some fixes