Improved the annotations system, uses regex and supports multiple annotations