Improved find pattern
Added more things in TODO