Removed old codes
Extracted the general pattern, gonna do a total revamp of specs